(byte-compile-find-cl-functions): Match

against file-name-nondirectory.
Fix text on user customization variables.

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 0a37f098a7bd691b97ba7ea689deba44ffbd5beb..619b7533ca76d365dd405dae8d301cc567e951a3 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -98,7 +98,7 @@
 ;;                             `obsolete'  (obsolete variables and functions)
 ;;                             `noruntime' (calls to functions only defined
 ;;                                          within `eval-when-compile')
-;;                             `cl-warnings' (calls to CL functions)
+;;                             `cl-functions' (calls to CL functions)
 ;;                             `interactive-only' (calls to commands that are
 ;;                                                not good to call from Lisp)
 ;;                             `make-local' (dubious calls to
@@ -1348,7 +1348,8 @@ extra args."
   (unless byte-compile-cl-functions
     (dolist (elt load-history)
       (when (and (stringp (car elt))
-                (string-match "^cl\\>" (car elt)))
+                (string-match
+                 "^cl\\>" (file-name-nondirectory (car elt))))
        (setq byte-compile-cl-functions
              (append byte-compile-cl-functions
                      (cdr elt)))))